Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

furmark: init at 2.3.0.0 #290458

Merged
merged 1 commit into from
May 22, 2024
Merged

Conversation

surfaceflinger
Copy link
Member

@surfaceflinger surfaceflinger commented Feb 21, 2024

Description of changes

closes #301760

Added a package for FurMark v2

Uses makeWrapper hackery because it tries to access files at the same directory as executable and because it has trouble finding Vulkan like Chromium.

No icon set because FurMark doesn't have any easily accessible logo anywhere for this case.
Should I leave it as it is or change it to application-x-executable?

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3484

pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
@surfaceflinger
Copy link
Member Author

New version got released for 64 bit only. Should I leave it as it is after a force-push or should I just drop 32 bit build?

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3617

@surfaceflinger surfaceflinger changed the title furmark: init at 2.0.16 furmark: init at 2.2.0.1 Apr 20, 2024
@surfaceflinger surfaceflinger changed the title furmark: init at 2.2.0.1 furmark: init at 2.2.0.0 May 5, 2024
@eclairevoyant
Copy link
Contributor

How do you test this package? Getting no error but no output either when trying to run a test.

$ result/bin/furmark --p1080
MESA-INTEL: warning: cannot initialize blitter engine

@surfaceflinger
Copy link
Member Author

How do you test this package? Getting no error but no output either when trying to run a test.

$ result/bin/furmark --p1080
MESA-INTEL: warning: cannot initialize blitter engine

You want to run the gui, but if you want to test cli
furmark --demo furmark-gl
furmark --demo furmark-vk

pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/fu/furmark/package.nix Outdated Show resolved Hide resolved
@surfaceflinger
Copy link
Member Author

tysm, I'll fix everything later today, I'm at work rn

@surfaceflinger
Copy link
Member Author

I left i686-linux as leaving it isn't really problematic imo, also I added aarch64 which was added in 2.3.0.0. Could you please check again?

@eclairevoyant eclairevoyant dismissed their stale review May 21, 2024 10:37

changes addressed

@eclairevoyant eclairevoyant changed the title furmark: init at 2.2.0.0 furmark: init at 2.3.0.0 May 21, 2024
Copy link
Contributor

@eclairevoyant eclairevoyant left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have a native aarch64 device to test on, though I tried with binfmt and it segfaults at runtime

non-existent Revision: Could not determine Pi model
zsh: segmentation fault (core dumped)  result/bin/FurMark_GUI

Do you have such a device to test this on to confirm that it works?

@surfaceflinger
Copy link
Member Author

surfaceflinger commented May 22, 2024

I don't have a native aarch64 device to test on, though I tried with binfmt and it segfaults at runtime

non-existent Revision: Could not determine Pi model
zsh: segmentation fault (core dumped)  result/bin/FurMark_GUI

Do you have such a device to test this on to confirm that it works?

I don't.
Also I didn't have much success running even cli apps using binfmt beforr. I wonder if that segfault is caused by emulation or if furmark runs only on rpi 😐

@ErrorNoInternet
Copy link
Contributor

ErrorNoInternet commented May 22, 2024

Seems to fail with the same error, even on my Raspberry Pi 4

Nevermind, running it directly as furmark seems to work.

@eclairevoyant eclairevoyant merged commit ffb9257 into NixOS:master May 22, 2024
26 checks passed
@vcunat
Copy link
Member

vcunat commented May 22, 2024

The style of handling unsupported platforms in this PR doesn't go well with the current release-checks: https://hydra.nixos.org/build/260730842/nixlog/1/tail
and consequently the nixpkgs-unstable channel is blocked (and maybe more of them that haven't tried yet).

@eclairevoyant
Copy link
Contributor

eclairevoyant commented May 22, 2024

Not sure I understand - meta.platforms only lists linux, why is darwin being checked? And why is CI not catching this?

@vcunat
Copy link
Member

vcunat commented May 22, 2024

CI doesn't exactly replicate all checks. I'm not saying it's this PR's fault really – maybe it would be better to relax the checks. I'm not sure why you'd need a valid version if you don't support that platform.

@eclairevoyant
Copy link
Contributor

I've created a revert PR at #313741, let me know if that suffices for now.

@surfaceflinger
Copy link
Member Author

I'm not sure why you'd need a valid version if you don't support that platform.

huh? you mean it tries to run passthru.tests.version on darwin?

@vcunat
Copy link
Member

vcunat commented May 22, 2024

No. furmark.version

@eclairevoyant
Copy link
Contributor

No, they're saying it's checking the version attribute for even unsupported platforms. I guess the other option would be something like versions.${system} or throw "Unsupported platform" but I'm not sure how to run the release checks hence went with the simple revert PR.

@vcunat
Copy link
Member

vcunat commented May 22, 2024

The checks can be run e.g. by nix build -f pkgs/top-level/release.nix release-checks but beware that it's expensive. It eats lots of RAM, in particular.

@surfaceflinger
Copy link
Member Author

alr, so something like this should be enough?

src = sources.${stdenv.hostPlatform.system}
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

should we do it in both version and src?

@surfaceflinger
Copy link
Member Author

I'll be leaving work in 30 mins if this can wait, unless if someone wants to PR it right now, or just merge the revert I guess

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Package request: FurMark
7 participants